Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Fri, 16 Jul 2010 15:45:58 +0000 (11:45 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Fri, 16 Jul 2010 15:45:58 +0000 (11:45 -0400)

Trivial merge